From: Benjamin Berg <bberg@redhat.com>
Date: Wed, 28 Apr 2021 16:32:22 +0000 (+0200)
Subject: gdm: Remove pending fingerprint verification failure
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~37
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=724291de7f9fc89662fb7a0c71f4226a62eb2359;p=gnome-shell.git

gdm: Remove pending fingerprint verification failure

It can happen that we get a problem report and a verification failure at
the same time. For fingerprint, a problem report can result in an
internal verification failure to be queued.

Remove this queued failure again if we got a failure already from GDM
directly.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1821>
---

diff --git a/js/gdm/util.js b/js/gdm/util.js
index ecaf09b6a..72561daab 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -686,6 +686,11 @@ var ShellUserVerifier = class {
     }
 
     _verificationFailed(serviceName, shouldRetry) {
+        if (serviceName === FINGERPRINT_SERVICE_NAME) {
+            if (this._fingerprintFailedId)
+                GLib.source_remove(this._fingerprintFailedId);
+        }
+
         // For Not Listed / enterprise logins, immediately reset
         // the dialog
         // Otherwise, when in login mode we allow ALLOWED_FAILURES attempts.